Style and other minor updates v1

As requested