refactoring

simplification of code only