Refactoring / changing styles