finish method refactoring