Reformatted code to Maven code conventions