refactoring according to pr comments