Reformatted to stay within 80 chars per line