Code cleaning, splitting, and more