Clean up of Code
Clean up of Code