No functionality changes. Just refactored to make init smaller
No changes, just indentation