Reformatted for 1.7 and Gradle