Cleaned up code

Removed all the commented out lines