DRY code, add tests for new method