Code and output re-organised.

(Looking a little less embarrasing.)

Signed-off-by: Duncan <duncan@oeith.co.uk>