refactor of whole class, delete of old parse class