Refactor AceMode
Fix comment