Adapted messenger.php to Coding standard