Refactored arguments and defaults