Refactored some code into multiple files for better readability