Minor format changes and comments