Small refactoring on run mojo