identation of expressions, fixed typo in new options name
removed unused local declarations