Removed templates in Angle (#14)