Improve code quality in command bind