Further cleanup. Implemented HTML Formatter