removed unnecessary constant
Removed puzzle
Removed unnecessary puzzle
Removing one-time variable
Moved String