moved the question loading code to the Questionaire part of the code. doing some simple code cleanup and formatting
updated some formatting