Reformat code, minor style change