Refactor code structure for improved readability and maintainability

f0f2f77

harshlocham commited on May 8