Cleaned up timings, logic, etc