s1725: clean up, re-organize