Fixed problem with sending messages to those who don't need them
Reformatting and comments