cleaning formatting and ordering