refactoring after review comments