comments and style cleanup