Removing some temp variables