[MOD] Options: hard-coded option strings replaced with Option instances
[MIN] Options: comments
[MIN] Options: cleanup