Some style remarks

but functionally complete