Imrpve code