cleaning & fixing code part2