Did a small refactor... mainly to review the code I've done so far since I haven't work on the project in a while.