Minor modifications

Remove some namespaces
Some renaming
Increasing refernce usage
reduce is added!