Fixed formatting inconsistencies.
Updated gradle build to 1.8.