Comments, minor style updates