Simplifying code. No functional changes
Revert setting small (800x600) window size, it breaks overflow_test