feature(public): various style fixes
Merge pull request #183 from Yahkob/styleRefactor

feature(public): various style fixes