Corrected some formatting problems caused by commenting lines in previous commits.