reformatted a few things after merge