More indentation and simpler angcomp computation