[REVIEW] code clean.
[REVIEW]MOBILE-1149+MOBILE-1144
Merge pull request #25 from jmpascal/master

[REVIEW]MOBILE-1149+MOBILE-1144