Tidied up variable names and added calls to parser
More inline documentation