Minor reformatting and comment structure