Remove $ character from commands and slight format tweak