diff --git a/hooks/pre-commit b/hooks/pre-commit
index 1929ee91..45a5b052 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -59,12 +59,12 @@ fi
 PEP8_IGNORE="E123,E501,W503"
 
 err() {
-	echo ERROR: "$@"
+	echo >&2 ERROR: "$@"
 	exit 1
 }
 
 warn() {
-	echo WARNING: "$@"
+	echo >&2 WARNING: "$@"
 }
 
 cmd_exists() {
@@ -72,20 +72,21 @@ cmd_exists() {
 }
 
 find_command() {
-	local name=$1
-	for suff in "3" "-python3" ""; do
-		cmd=${1}${suff}
-		if cmd_exists $cmd; then
-			echo $cmd
-			return 0
-		fi
+	for name in $@; do
+		for suff in "3" "-python3" ""; do
+			cmd=${name}${suff}
+			if cmd_exists $cmd; then
+				echo $cmd
+				return 0
+			fi
+		done
 	done
 	warn "$1 is not installed, using dummy placeholder!"
-	echo -n echo
+	echo :
 }
 
 PYFLAKES=$(find_command pyflakes)
-PEP8=$(find_command pep8)
+PEP8=$(find_command pycodestyle pep8)
 
 if [ "$PY_FILES $PY_TEST_FILES" != " " ]; then
     if ! $PYFLAKES $PY_FILES $PY_TEST_FILES; then