changed regexfor leave command
Fix error without channel.

Also pep8 and more concise comments
Merge branch 'fix_leave'

* fix_leave:
  Fix error without channel.
  changed regexfor leave command