Improved readability & algo.