minor amount of code clean up.. general housekeeping