Comments sorted. Fix #54