prettify and initial cleanup.