Standardize some spacing