Code style updates
More code style things