added gradle files.
some code cleanup (cosmetic)
Merge remote-tracking branch 'origin/master'