Fixed styles, code formatting and gradle build