Minor reformatting and additional comments