Refactor to make more clear