Refactored spacer
Refactoring