cleaned up spec stuff