removing comment line
changed option class names to be more symantic