Cleaned up comments and commented out code