Code cleanedwq