Refactoring, finished comparison operators