Minor re-arrangement