removed test for type and addressed nitpicks