Cleaned up timer code