Variable names and default refactored.