Move actions to new corresponding action classes
Use factory method to create delegation reporter
Fix else line number