- Upgraded to the latest gradle tool
- Added comments to various code to improve understandability