Refactoring style
More style refactoring