Cleaner env/namespace code