Clean up of code
Clean up of code