Checkstyle done except for casts in TimeCalc.
Commented line removed
Optimising code in TimeCalc