Reformatted, updated copyright