Refactored some specs
Added notes