made changes to better conform to coding standards.