Refactoring things to have better names