Changed TheoremSet to use HashMaps

This is much better.
Minor change to LineNumber

Wanted to fix indentation