Improved option flag usability