Improve code
Imrpve code
Cleanup
Improve code