cleaned up spec