Updated files to meet the coding standards