refactorig #3