1 refactoring for ease of use