Timer code clenup