Cleaned up option and optionmanager somewhat