fixes to code standards