Refactored specs
Code style