Styling and other small updates

Lots of styling updates and code formatting.