Minor code order change