An updated and tidier version of the original Superfish