Refactor
uncomment doAction