Improvement and cleanup