- a little bit of cleanup