some more refactored code
some more refactored code