Code Quality Changes