Clean up HTML further, WPM edit