cleanup -- break long lines, remove a warning