update a few comments, break long function declaration into multiple lines