Address findbugs warnings

Fixed some code constructed discovered by findbugs analysis

1)  no final in public static
2)  null dereferencing 
3)  NaN comparision