Minor Refactoring
Additional fixes
namespace refactoring