first pass at clean up