minor additional cleanup