Removing useless over-optimization affecting readability