Who is the most important in consolidating nazi control of Germany until 1939, Hitler or Himmler?

Please help, for my controlled esment I need to answer the question above. Basically talking about who had most control and what control they did have including their backgrounds and comparisons between them. Also talk about Goebells (minstry of propganda) and how he controlled Germany