Styling
More styling and tidying