Minor clean up and generic added instead of Dynamic usage on compare