Refactoring styles a little