Cleans up code
Streamlines so only one match returned