Fix a few code pro violations