Code Clean Up

Code Clean Up By Nithin George