Made matching code (arguably) more simple