Refactored everything! Established a standard for commenting that will keep things sane for reading