refactor back to one method and move spec