Increase handling with placeholders and legibility

When working with this excellent bundle I notices that sometimes I had to retype units because they were within the placeholders. So I changed that and while I was doing it, I reformatted the output a bit.

I hope you are okay with that.