Spacing & Number Fix #5