coding standard clean-ups