Styling of the code - better