Refactor for changing otogiri interfaces