cleanup with vars and default values