Reformat to match forked repo