Modification to abstraction & formatting fixes

Difficult to make changes with a template in place. Will come back to
later when I have a stronger understanding of templates.