Refactoring and initial styles