supression of warnings
code refactorings
small refactoring