Internal simplifications and clarifications