PR for code review

Kindly add also to all if and if-else statements