Save before reworking generate stack.
Readability and comments