Code reformat to standardize, sorry