code clean up, namespace Skit removed