convenience linlin
tidy up comments
decruft