clean up a bit more