better formatting and layout