Code Quality Update