minor rework, fixes line length etc