More decorating section clean up.
Language tweaks.