some simplifications + comments