Cleanup.
Create public method for creating an effort.
Refactor.