Tidy, + added env script.