Address some review comments
Move HTML data into a separate module