An attempt to improve readability