housekeeping

cleaning up some code