Refactoring to a consistent style