Sorting members, cleaning up code, etc