- move checks to functions to isolate single-use variables as local - signify globally available variables with capitalization - move setup and mount to functions to mirror umount_all and restore_env - cluster functions by use order (no call should preceed its function) - use short circuit return tests to reduce indentation now that we use functions