cleaning up questions code