reformatting and comments