reorder functions in commands.go