drying up some of the code

drying up some of the code