Code cleanned