Refactor - runtime improved