cleaned up a number of things
cleaned up a number of things