Tidied up the code.
Rename classes to be more succinct.
Parse field name.