[PATCH 3/3] whoami: Refactor and add more commands.