ENH: more ln + style improvements

...