Some small prettifying, add HTML generator