Reformat to match project code style