reorganise code lines. No functional changes