reformat code

This doesn't change the functionality, only remove some possible
ambiguities.