Minor Updates

Mostly style updates