Formula clean up