Tidied up imports
Simplified parse significantly