first pass at cleaning wordsize