Add findByIdAndModify method.
Minor refactoring.