Some clean-up suggestions.

Quick Reply