Basic helper placeholder for further refactoring ...
New helpers ...
Fixed some of rubocop issues