Styles and refactors