Refactored names
Removed finish method