Improve formatting of output to be similar to what snap does