clean things up a little