Couple of stylistic changes