ENABLE max-line-len options support
Tidy up options