defactoring + 2048