cleaning up a bit
cleanup