Refactors not_found, closes #22