Release/bb refaktor

Styling fixes from Frans