little bit of cleanup ...