Minor internal code style changes