Commit cdece1f248e95bc017e4d1b6b960aa8f00971097

Con Kolivas 2011-08-16T10:45:02

Simplify code and tidy output.