Refactoring: Rename Class， and extracting statements