clean up things a bit