rename methods and refactoring of functions.