Fix formatting and spacing