Styling, code simplified