Refactor method name and formatting