Moved =future=> 
A little cleanup