+ static analysis issues fixed