Would be nice to see more style changes in the other PR to not mix up things.