some minor cleanup changes