remove unused protocol, condp == -> case, formatting