slight cleanup on Q3