refactored more code to streamline any move functions