Spacing
Refactor, breaking API change to not use block