first pass at cleaning up