Clean line length problems
Refine the liberal use of 'engine' at the repository level - pass through
Merge pull request #11 from wfro/refactor

Refactor