Indentation fixes
Drop (implicit) requirement on regex -- use irregex instead
Explicit use of all required units
Pretty-print parameter values