Simplify a code.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'
Update code based on new implementation in orchestra/html.

Signed-off-by: crynobone <crynobone@gmail.com>