Use angle types in appropriate locations