Refactor UpdateMolotov away (#64)