made changes to conform to code standards