code standards updates, first pass