refactored. I'm still having fun, and still don't need cool commits on GitHub for this project :)