Refactored Spacing