Revert "Revert "Second commit - Proper naming and HTML removal""

This reverts commit a18e9d8350517dd345273a9dcf268fc2005376ed.