Getting there...tidied up the env