Methods refactoring + doc + typed delegate