Cleaned up the DOM further