Fixed formatting and ordering