correcting coding rule violations (Christoph)