Minor cod style changes