Formatting, commenting, and minor changes