refactoring for consistency