Refactor code structure for improved readability and maintainability 282197c Arnab Dey commited on Jan 18