refactored the code to organize it and make code maintainance super cool