Small changes.

Removal of namespace. Constructor arguments.