refactor to use namespace