Cleaned up spec definitions