MOBILE-494 Fix code style, added callbacks