printRoster() and cleaned up some code