Switches all appropriate `echo`s to the short echo

I will comment on some lines. Looking for feedback on this.