minor cleanup changes