Clean and organize code