Styling

ReFactored