#80 refactoring Handle: finished