Fix indents and Option class init.
Add Option class.