game logic overhaul

I noticed this too and I don't know how to fix it. I'll try the formatter to see if it helps.