Cleaned Up Spacing