Standardize and comment