Make headings consistent
Add more tests
Extract dictionary parsing
Make comments more prominent