NYC procedural generator update 3: Improved code