Reduced update time and cleanup