Refactor: push this into a block
Fix: indenting