Refactor; user 'expect' format