spell out some names for clarity.

also remove a line break