Refactor & started command handler