Add options.helpersBase
Fix indentations and remove unnecessary variable declarations.
Merge branch 'feature-helpersbase' into dev