tidy up comments
resolved merger from upstream
code tidy up
code tidy up
Merge remote-tracking branch 'upstream/master'
code tidy up