Refactor html tags