Code Quality Improvement by Arbaz Khan