refactoring 20:56