Update to gradle 1.12
Minor code cleanup