Change identations and refactored the specs