Coding standards update

Update to match coding standards.