Htlm refactoring and identation
Merge pull request #1 from sebabelmar/REFACTORING

Htlm refactoring and identation