Revert "Second commit - Proper naming and HTML removal"

This reverts commit 42d0cffe314205d9960e6023dc561c032e2d3d6b.