diff --git a/aemw b/aemw
index 8db2bee2..bc58eb63 100755
--- a/aemw
+++ b/aemw
@@ -5,17 +5,18 @@ COMMAND_DEFAULT=${AEMC_COMMAND_DEFAULT:-"setup"}
 
 . aem/api.sh
 
+BIN_NAME="aemc-cli"
 OS=$(detectOs)
 ARCH=$(detectArch)
 DOWNLOAD_URL="https://github.com/wttech/aemc/releases/download/v${VERSION}/${BIN_NAME}_${OS}_${ARCH}.tar.gz"
-BIN_NAME="aemc-cli"
+
+# Download or build tool
+
 BIN_ROOT="aem/home/cli/$VERSION"
 BIN_ARCHIVE_FILE="$BIN_ROOT/$BIN_NAME.tar.gz"
 BIN_ARCHIVE_DIR="$BIN_ROOT/$BIN_NAME"
 BIN_EXEC_FILE="$BIN_ARCHIVE_DIR/$BIN_NAME"
 
-# Download or build tool
-
 if [ "$VERSION" = "dev" ]; then
   make build
   BIN_EXEC_FILE="bin/aem"