Remove good qualification (useless as it is now and not optimised) and add comments