Large batch of changes

Mostly formatting