clean up code ever so slightly