Fine tuning and cleanup