MOBILE-502 Fixing coding and comment style issues