Clean and fix code
Clean up