Refactor disable command; match plugin layout