Refactor for citizen auth revamp