Fix formatting: no other changes
Remove duplication by moving object instantatiation

Should be part of the module, anyway.