Fix formatting and ordering