Extract parser logic to new class
Remove unnecessary method