minor cleanup here and there