cleand some code