Complete first pass of code standards cleanup.