Code improvment.