add guard
Clean up specs