Some refactoring for method names.