Clean up formatting and layout