clean up the statics a little bit