q2 run log + refactor