Fixes code pro violations