improve logs and remove repetition