Minor re-arrangement to make output consistent