cleaned up options object