Cosmetic + remove unused var and useless printf