Refactoring specs
Update README