removed small stuff the clang analyzer found