cleaned up some things
More Housekeeping