Merge remote-tracking branch 'origin/pr/694'

* origin/pr/694:
  Balloon typo
  Annotate types
  Standardize object names
  Minor cleanup
  Remove commented code
  Fix pylint complaints

Author: marmarek