Some more cosmetics/indent changes