Cleaned up Comment's as per joe's recommendations.