Clean up of Code
No idea