Removed some boilerplate code from the QNA steps