A little code cleanup; naming and comments.