Refactored spacer