Just a few small comments and formatting changes