Minro refactor