Removes commented out code
Removes unused method
Makes fields final