minor cleaning of code no.2