CLOUD-146 refactored message setters
CLOUD-163 fixed style issue