code improvements
remove todos
Merge branch 'master' into pavel/development