reorganise SQL statements 001