Update gradle and fix some formatting