Cleaned up code 

Cleaned up comments and got rid of unnecessary methods.