Code Clean up
code Clean up