law of demeter fixes
removed empty helpers
refactored to store logic in helper rather than view
Merge branch 'feature/best-practices' into develop

* feature/best-practices:
  refactored to store logic in helper rather than view
  removed empty helpers
  law of demeter fixes