Refactor specs and update README