Nice indenting and polishing on Jurg

Some clean up