beginning a little bit of cleanup