reformat marty's commits. we don't build in gnu right now. oops?