Refactoring and adding style elements.