fixes to conform to coding standards