refactoring. fix linted lines
piw