final dialyzer fixes and some whitespace