Refactor for production robot