Minor Doran changes and re-commit

Some changes to Doran code for legibility, brevity, and to fix spacing issues.

Also a recommit of https://github.com/Nuku/Flexible-Survival/commit/2d41853780e0d408102b60e80a7b382951ce4728, since I believe that was mistaken reverted.