Refactor to better names