Minor formatting improvements and more automation

* This should be a first release candidate