10 fix formatting and access modifiers

Fixes #10, #11 , #15, #19