Move code around, for consistency