formatting, comments and other changes