review code variables and add namespace option