Fix expected output formatting
Add bible type if in configuration
Refactor into functions