code cleanned