Cleaned up option variables/properties