minor fixes to conform to standard conventions