WIP: Refactor spacing