Refactor to make it easier to understand and to explain android components
More improvements tomake it easier to read and to show best practices
Merge pull request #1 from santiago-hollmann/refactor/improvements

Refactor/improvements
Merge pull request #2 from luacevedo/develop

Develop