#6 - some reformatting
- removing unnec. instance variable
- renaming of constants
#6 removing unnec. instance variables again
Merge branch 'issue/QM-6'