Refactor to better name