refactoring to avoid double code
cleanup imports