Refactor & support honk command