added abstractions to use half the spacing

Made use of the same variable names used for the base.

Hug.
Merge branch 'feature/helpers' into v5.0
Merge branch 'v5.0' into feature/submodule