Refactoring to match coding standards