Fixed the array inside namespaces not being colored
Minor cleaning and fixing 'this$' statements