Tidying up Manchester OWL Syntax parser code