simplifications and comments