cleanup time
more and more cleanup
gettin cleaner, I think