Refactoring + safer specs