remove cruft
DRYing, formating