Fix formatting and styling