Cleaned up the commenting