Refactoring: Algorithm 1 and 2 in class Roster