Refactor to be more clear