Fixed all of bugs minor which sonar warning, except 2 bugs I will try to find solution to fix it.