Modify to more consistent spacing and commenting.