MUS-90: Finished small TODOs

Getting rid of small TODOs in the Code: Moved a variable to another
class, checked if other TODOs are still needed, added Exception text