lots of re-formatting to make nose-tests happy