Refactor to be more descriptive