Reformatted to consistent style