Code cleanupw