Reorganise tx validation