Style work and refactoring markup