Small structural changes (no effect on the output)