Standardize some stuff for #95