COde cleanup
Code cleanup