Refactor silly logic of revoke method