Cleaned up a little bit. Removed some of my commented out code and unused imports.