Remove accidental duplicate code
Sort members
Minor fix to logging output