Replaced if/elif/else statements for loops, made self.sort a list