Fixed syntax errors from refactor in c1b35a5
Fixed syntax errors from refactor in c1b35a5

Could only test now, so there were some problems with putting these in
classes that I did not notice before.

timvandermeij/sentiment-analysis,timvandermeij/sentiment-analysis