[REFACTOR] use #extract_options! instead of homegrown version