Reformatted the code for Maven, convention