* refactored the hell out of the project to get uniform readability standards