Refactor code
Refactor html code