Code Quality Improvement