Reformat to our source code poliy and to not have dangling unless