Hg 73 store namespace data

@kenkouot 
actually refactor so this closure just has one var statement at the top of the func