Better r2048, more random refactoring for anal sdbization