first pass at cleanup