refactoring of method and data with shorter names.