Rearranged WSplit parser for clarity, added more comments