CHANGED gradle dependencies to the shorthand version
MINOR change of code style and attribute visibility
CHANGED some indexes and attribute names for better ilustration