Tidied parser