refactoring + screenshot