cleaned up a few more things