Cleaned up HTML some more