Initial environment swapping, initial Beneath environment, refactoring