cleanig code