Refactor code structure for improved readability and maintainability; removed...

Refactor code structure for improved readability and maintainability; removed redundant code blocks and optimized functions.