Refactored some forgotten $base-spacing calc