Add comma to several default structures

They can be added now because the acronym maker now automatically-detects when to add a space.
Simplify function calls