Format and remove commented out functions