Some Code Clean up