Reformatted to avoid github rendering problems, take 2