refact:by q