Clean up and pre formatting