Better specs and refactor