improve spec & remove seemingly unnecessary complexity