Refactoring some styles