Refactor names, comments and method