todo note
small refactorings