Refactored out delegate methods