refactoring for neatness