Refactor Spacing