style, remove trailing white from some files
style, format Makefile.am comments
Merge branch 'style'

* style:
  style, format Makefile.am comments
  style, remove trailing white from some files