Made formatting improvements suggested by Chris D.