environment attributes separated in class and instance attributes
minor changes