Cleaning up parser class, extracting matrix