Run code cleanup + fix headers