MIFOSX-195: some formatting and clean up whilst testing this issue.