Introduction to using namespaces - first shot.
Added some code clean up changes, related with namespaces.