Reformatting of the code as well as updates to gradle build