Reformatted using new code style