Put through Reshaper Code Cleanup