Refactoring, new acro game