cleaning up things a bit