Refactor q-q-q-q to single item pattern