Refactor code structure for improved readability and maintainability abf9c93 Jonathan Harrison commited on Jan 8