Cosmetics
Refactored future get/move