Formatting
More cosmetic changes