experimenting with various style tweaks
new build & lint fixes