Clean up of code!