Small changes including removing namespace name.