Fix formatting and style