updated namespace
final commit
clean up