corrected spelling
merged options to relevant nested attribute
cleanup code