moved namespace; refactored constructor