Cleaned up in the move function.