working on cleaning things up
cleanup