Remove white space; edit comments.