Simplification of data flow between methods and refactoring.
Fixes typo.
Merge branch 'feat169/metawidgetEfficiency'
Fixes conflicts