Switched to pure game interface, tightened up code