Formatting and more best practice.