Fixed class constants style errors

Also removed commented out code