Code rafactor.