Code refactor, minor EQ changes