Clean up options parsers. Add comments