better code structure and new namespace value