code and comment cleanup.