Cleanup + time calculation cleaned up