Working on refactoring code, adding helper classes, and adding comments.