Refactor -1