clean things up a tad