Additional refactor of /claimit command