Refactor: Vertical and Horizontol spacing