Refactored main class, began commenting