Better fix for the dialyzer call
Minor cleanup