Refactors for consistency: variable names, argument order. Completes "Working" state.