Mojo refactor