Cleanup CLI option building
Adjust maximum class length