Improved defaults + function scoping goodness