Move things for better flow