Merge branch 'feature/bbf-16' into develop
Code format fixes
Merge pull request #2 from AlexKimani/feature/bbf-16#1

Minor edits and formatting fixes.