cosmetic changes to the code
Merge remote-tracking branch 'origin/flow' into flow