diff --git a/tools/op.sh b/tools/op.sh
index 0dde7d1908..05a55cd35b 100755
--- a/tools/op.sh
+++ b/tools/op.sh
@@ -312,19 +312,22 @@ function op_default() {
   echo ""
   echo -e "${BOLD}${UNDERLINE}Usage:${NC} op [OPTIONS] <COMMAND>"
   echo ""
-  echo -e "${BOLD}${UNDERLINE}Commands:${NC}"
-  echo -e "  ${BOLD}venv${NC}     Activate the python virtual environment"
+  echo -e "${BOLD}${UNDERLINE}Commands [System]:${NC}"
   echo -e "  ${BOLD}check${NC}    Check the development environment (git, os, python) to start using openpilot"
+  echo -e "  ${BOLD}venv${NC}     Activate the python virtual environment"
   echo -e "  ${BOLD}setup${NC}    Install openpilot dependencies"
   echo -e "  ${BOLD}build${NC}    Run the openpilot build system in the current working directory"
-  echo -e "  ${BOLD}sim${NC}      Run openpilot in a simulator"
+  echo -e "  ${BOLD}install${NC}  Install the 'op' tool system wide"
+  echo ""
+  echo -e "${BOLD}${UNDERLINE}Commands [Tooling]:${NC}"
   echo -e "  ${BOLD}juggle${NC}   Run PlotJuggler"
   echo -e "  ${BOLD}replay${NC}   Run Replay"
   echo -e "  ${BOLD}cabana${NC}   Run Cabana"
+  echo ""
+  echo -e "${BOLD}${UNDERLINE}Commands [Testing]:${NC}"
+  echo -e "  ${BOLD}sim${NC}      Run openpilot in a simulator"
   echo -e "  ${BOLD}lint${NC}     Run the linter"
   echo -e "  ${BOLD}test${NC}     Run all unit tests from pytest"
-  echo -e "  ${BOLD}help${NC}     Show this message"
-  echo -e "  ${BOLD}install${NC}  Install the 'op' tool system wide"
   echo ""
   echo -e "${BOLD}${UNDERLINE}Options:${NC}"
   echo -e "  ${BOLD}-d, --dir${NC}"