Cleaned up the comparators class and changed a few instances of related typing.

Issue: FMA-58
Issue: FMA-54
Change-Id: If444216ec332b7e5a48d702d19ff1e82aef5a048