Final size optimization with better legibility and correctness. :)