Tabs to spaces.
Renamed question.type to question.category
Condensed domain classes. Added logging.