Code clean up (SRP in StandardTimer)