Fixed stuff from the review

- changed variable names
- added breaks
- corrected a comment
- deleted explicit declaration of true/false in ifs
- fixed a bug in tests caused by passing the message by reference