Useless comments removed + chat added