Unused parsing methods removed plus naming fixes