More clean up of common role

More white space, more names, consolidate some tasks.

Also purge fireball leavings. Not in use, not likely to be used again.