deleted & cleaned some code