Adding HTML formatter, rearranging code.