Reformatted according to java code conventions