MOBILE-168 Comments added to the code