cleanup and purdyfy