Refactoring done with class name and variable name.