dartfmt selective
Merge remote-tracking branch 'origin/pr/12'
code cleanup