Re-enabled Disable Comments option
Refactored WPCLI batch runs