refactor html-source