Merge pull request #220 from cbracken/dartformat_cleanups

Reformat with dartformat