Use more accurate headings
Make everything part of a class