Cleaned up spec