Cleaned up commenting