Code Clean Up

Code clean up