Fixing Article comments and variables names