cleaning and assert instead of wrong assignment