Cleanup and added timings