reverting code style changes

too broad, going to have to target sections by hand