Code cleanup (make analyzers happier)