Fixed Time Remaining and Refactoring

Fixed time remaining so that it is set to 60 each round. Previously it
started counting when the game started and nothing reset it.
For refactoring removed commented out code.