Refactor a bit. Rename commands to server-status and session-status