cleaning > to &gt;
minor fixes, simplifications