Simplified changes

Visually unchanged, code now works with both existing GameHeart as well
as future WCS GameHeart