Refactored finish.