major game refactor
cleanup