Ignore irrelevant values
major refactoring