[enhancement] a little bit of cleanup