small refactorings, added ToDos