Cleanup, remove timing
Add extract method hints
Extract functions