Refactor
Clean-up specs