cleanup, refactoring, quick game functionality