More code simplifaction.