Refactored everything.
Removed commented out code