Imporve code