Changed max length of env name to 30. Clean up