whitespace tidy. Add kibit to try out.