some static analysis cleanup