Code cleanup
Update gradle version