MOBILE-196 Fixing coding style