some re-formatting etc