Good random changes
Remove weird return statement
Ensure we initialize dwarf on calls