refactoring, styles, comments oh my