coding standard cleanup