small changes, refactoring, etc
sort members