Refactor: Spacing