Use a constant for default options
Cleanup whitespace