Draw code minor changes