refactoring names for more neatness