Small robot refactor