[Clean] Reduce code violations.