Refactoring for clearer names/functionality