Minor readability changes.
Avoid joining a channel twice.
Change name of user() function.