neatness refactoring