text and some code cleanup