Refactor method names. Final touches.