Removed old comments; added new commenting system