Timer & Code Cleanup