Cleaned up specs