changes after review
codestyle fixes