brought more files up to coding standards