DocumentEventMethods improvements
Minor code refactoring