Code cleanded