Refactor the code to make it look more object-oriented and maintainable - View it on GitHub