Clint

cleaned up some code