formatting clean up and separation